From 1371cd114ac4637b4be8065157d15dd0977776a3 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sat, 28 Mar 2015 23:30:39 -0700 Subject: [PATCH] Help diagnose flaky test --- src/cargo/ops/cargo_rustc/mod.rs | 4 ++-- tests/test_cargo_bench.rs | 2 +- tests/test_cargo_test.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs index d5d6d170b..c553547e7 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -375,12 +375,12 @@ fn rustc(package: &Package, target: &Target, profile: &Profile, .to_str().unwrap() .replace(&real_name, &crate_name)); try!(fs::rename(&src, &dst).chain_error(|| { - human(format!("could not rename crate {:?}", src)) + internal(format!("could not rename crate {:?}", src)) })); } try!(fs::rename(&rustc_dep_info_loc, &dep_info_loc).chain_error(|| { - human(format!("could not rename dep info: {:?}", + internal(format!("could not rename dep info: {:?}", rustc_dep_info_loc)) })); try!(fingerprint::append_current_dir(&dep_info_loc, &cwd)); diff --git a/tests/test_cargo_bench.rs b/tests/test_cargo_bench.rs index 7f2231f6f..54de09ce9 100644 --- a/tests/test_cargo_bench.rs +++ b/tests/test_cargo_bench.rs @@ -648,7 +648,7 @@ test!(bin_there_for_integration { } "#); - let output = p.cargo_process("bench").exec_with_output().unwrap(); + let output = p.cargo_process("bench").arg("-v").exec_with_output().unwrap(); let output = str::from_utf8(&output.stdout).unwrap(); assert!(output.contains("main_bench ... bench: 0 ns/iter (+/- 0)"), "no main_bench\n{}", diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs index db11838b1..401ca3ba5 100644 --- a/tests/test_cargo_test.rs +++ b/tests/test_cargo_test.rs @@ -637,7 +637,7 @@ test!(bin_there_for_integration { } "#); - let output = p.cargo_process("test").exec_with_output().unwrap(); + let output = p.cargo_process("test").arg("-v").exec_with_output().unwrap(); let output = str::from_utf8(&output.stdout).unwrap(); assert!(output.contains("main_test ... ok"), "no main_test\n{}", output); assert!(output.contains("test_test ... ok"), "no test_test\n{}", output); -- 2.30.2